From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Tue, 6 Aug 2013 13:49:00 +0000 (-0400)
Subject: screenShield: Remove confusing name
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3815
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=899f7da032856b1ae43442eb688f3871e7641517;p=gnome-shell.git

screenShield: Remove confusing name

We have both finishDeactivate and completeDeactivate. Don't.
---

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 38ac63e7f..990f18ffb 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -1125,13 +1125,13 @@ const ScreenShield = new Lang.Class({
     deactivate: function(animate) {
         if (this._dialog)
             this._dialog.finish(Lang.bind(this, function() {
-                this._finishDeactivate(animate);
+                this._continueDeactivate(animate);
             }));
         else
-            this._finishDeactivate(animate);
+            this._continueDeactivate(animate);
     },
 
-    _finishDeactivate: function(animate) {
+    _continueDeactivate: function(animate) {
         this._hideLockScreen(animate, 0);
 
         if (this._hasLockScreen)